Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 31 Dec 2011 18:36:58 +0000 (10:36 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 31 Dec 2011 18:36:58 +0000 (10:36 -0800)
commitd23ea30d633db86ad8b4cd5975c8a0f3afc29b21
treeb263cf04250b4624b6d0e80c17ca6fce4f1986a3
parent40f0c444a965b52741bcd5bde1adfdc695f32f11
parentcee4af4cfa64d15dc079fc3c3c3b2eb67e4a3a55
Merge from trunk.